@SLaks, I have refactored and moved the less related code to `LessMargin` with 13ae217.