Close #5 : Removed all calls to cut/grep