REFACTOR: Replaced a few more symbols with strings