Formatting fixes, cleared white space.