Clean up imports, codestyle