Fix up some readablility of the code.