Fixing issues raised with pull request

Includes spreading this format to programmes.