A bit of cleanup fixed my idiocity