clean up

cleaned up code, prepared to merge user results