removed clutter and comments