ENH: Simpler calculation