Fix Format Messages Controller Class