Replaced magic numbers with constants