Some tidy ups