Clean up a little for PR