clean up, deleted old code, added a few comments