cleaning up a bit 1