coding #62 refactor