Massive Clean up
Time to work on it again