Update: Refactor, practice makes perfect