Even better code