More reference oriented tidying