Some better code