Refactor

https://www.youtube.com/watch?v=O-zpOMYRi0w