Cleanup

A little tidying because I was confusing myself with duplicate info.