Clean up a little code