cleaned up old code, added some comments