Remove redundant call in WPF Draw method
Redesign dk classes to be more friendly