Strings refactored #BH-1 Fixed