more cleanups and whitespace issues solved