A bit better code