Clean up based on a self review of the code.