refactored six