Standardized the values and  improved coding style