cleanup commented lines
more styling