Other suggested refactoring completed.