Cleaning code, moved strings to constants