More developer tidying