Removed unnecessary white space and fixed spacing