Cleanup white space and layout a little