cleanup and formatting
minor