some cleanup
lazy attempt at style