Few stylistic fixes