Moved strings to constants files