Better architecture
Code refactoring