cleaning up a bit more