Improvements & refactoring