Add -t option and cleanup strings