refactoring => remove magic numbers