Formatting and removing magic numbers