DDF-588: Took out old comments & formatted