Cleaning up & refactoring
...