rewriting some small stuff