Minor refactorig #186