Improvements from reviewing my own code.