cleaning up a little after that last merge