Added a TODO and replaced \n & \t