Fixing identation
Extracting message transation to a method