A little better code