refactoring; documentation; ExecutionContext