Remove magic numbers and magic strings