Clean up some sloppy work