Added more ideas for refactor