Just a little clean up from the last merge