Tidy up of code
3.12.4