Removed Whitespaces and some comments