Major changes to all calcs

Cut down code