Fix formatting and rename instance variables.