styling and some cleanup