Tidied up Officer designation.