Added variables with default values instead of magic numbers