Cleaning up code & refactoring