Resolving whitespace issues/cleaning up