Small refactoring
Better names