Formatting
Added message variable