Some better looking code