Fix code-style - remove trailing spaces and unused imports, declaration order