cleaning up a little bit more