Removed the use of ~str literals