small clean-up of unnecessary logic and comments