Re: #1606 - transitions / tidying