cleaned up code, added additional info