DDF-638 removed some style redundancy