Refactor from Code Critics