Do little style refactorings.