REFACTOR removed magic numbers