minor cleanup and formatting