Refactoring
Refactoring tweaks