renamed two methods, removed commented out code