Refactor: minor refactoring