Clean up and fix dumb error