Some refactoring done to make the method names more friendly