BONUS Refactored code and reflections
Update