more clean up. works