clean up mbaxter a little