Cleaned up all code and imports.