refactor code faster