remove unused imports, minor formatting cleanup