Removed the comments.
Removed an unneded return.