Minor refactorings (Organize imports, remove declaration redundancies, simplify expressions, etc)