unused imports, irregular indentation cleanup