Fixed the minor points highlighted by ajshort

- Changed to conform to the specified coding conventions
- Moved the 'p' tags out of the translation string