Initial commit -> refactoring