Simplified some return statements and cleared up some comments