REF: refactoring completed