Refactoring vocola classes