Refactoring calmar