NORMAL CHANGE: Code refactoring - performance optimization