Cleaned up a little bit of the mess I've made