Minor refactorings. :bikini: