String refactor and a few modifcations