Removes excess comments and adds small fixes