Some refactoring
Initial