Remove newline and fix import order