Minor performance improve