Refactoring pt1
Refactoring pt1..
Moo?
Refactoring pt 1