DDF-615 - formatted based on ddf eclipse java formatter..