Refactoring
more editability