Refactoring, using the moskus module