Minor code simplification