Imrpove clearance style

:warning: brunched but not cakebuilt to avoid conflicts