removing/cleaning up a bit