Removed Unneeded whitespace and comments