Final Refactor and added color to text