Little refactoring

- This is how it was designed
- This is how it should look like now