More consistent formatting, pull out message to variable