Calvinism improved