Some refactoring second commit