Develop

Practice 6 + refactoring