Removed unnecessary comments and code