Refactor part II