Turned some strings into constants (refactoring)