Small refactoring
Inching closer