Get rid of redundant calculations

Saved almost factor of 100. Oops.