Code cleanup: imports, indentation