More nomenclature tidying
Simplified inline code formatting