renaming some methods, bit of refactoring