Removed some redundant methods from TextController & Moved some code to other files