Reduce code some more