Tidied up unnecessary labels and messages.