tiny code and formatting cleanup