cleanup
sprucing up style