Refactor 2

Refactoring...