Refactoring work on repose