Minification improvements, now 2,825 bytes