Can I do a re-factor after implementation these functions?