Refactoring
more