Minor: Code optimization