Refactoring & fix