Minor refactorings & simplifications