Refactor follow code