DEV: Refactoring