cleanup in style
general cleanup and style