Further reduce code