Fixed up formatting errors and redundant code.