Refactor: minor changes