Style fix behind the scenes with @sn_hassan @ringosberyl