refactor
adjustments