Minor refactoring. v6.1