Re-factory Message