Additional refactoring, related to #5