removed old calculate class, cleaned up a few unnecessary comments