Removed strings and turned them into constants