minor cleanup and format