clean up, added docs