Cleaning up, refactoring, & other stuff