Tweaks
Refactoring