replaced magic numbers
remove magic numbers