Refactoring/Tweaks