Refactorings + Improvements