Did some refactoring of the method names