cleaned up a bit, not too much