Removed comments, added proper comments