Refactoring (and removed cucumber feature, because it didn't work well with this project)