Clean up a bad hack a little