misc style clean up