Removed comments, suggested more fixes