Remove magic numbers
Replace string literals