Further reduce code size