cleaning up small stuff