Cleaned up post processing calculations