Reduce code clutter