Ticket #56 - general tidy