cleans up a bit more