cleaned up, added a few comments