Nit: the indentation on several methods is off.