Cleanup and fixing my idiocracy.