Cleaning up before I show this project some love