Changing method names, added comments