Cleaning up and refactoring still