cleaning up a little bit