Clean up string handling and swap tabs for spaces for faiz