Maid 611 fix style issues