REFACTOR strings
Version 1.0.0 RC3