small changes + cleaning up a bit