Finish cleaning up Bellman class. Haven't run it yet