Removed the annoying white space issues