Refactorization
Tweaks
Some small tweaks