Updated some method names, and added comments