Cleanup: formatting, imports