Clean up some style - add a semblance of a real calculation, etc.