cleaned up some comments and got ride of uncessary validations