Scalaskel refactoring