Code get smaller, and better