Slight code simplification