Minor fixes & formatting
some cleanup and formatting