Updated whitespace and naming.