Slighly more efficient cell calculations