Refactored text formation to Util class.

Added 2 TODO messages