Style changes from r2s repo