Clean up, add absolute_imports, etc.