Minor performance improvement (simplification) was done.