lets clean up a bit more