Removed unnecessary comments

Also sorts out #2