Refactor

Refactoring changes...