Refactoring & improvements