Refactoring & changes