better sections
some cleanup