Small refactorings
v2.1.1