Declutter

Details in comments

Details in comments