DrawMargin, refactoring