Reduced a bit of computation time