Minor refactorings - Take 2

See #166