Computation caching
Small cleanups