Removed Commented code and white space