Tweaks
Refactor