Cleaned up some of the mess i have created