general code cleanup/white space correction