Cleaned up use of constant strings