Removed extra code and dependency on tput