Cleaned up after the mess I made