GH-2 Formatted message outputs and added more

guard conditions