Refactor: minor improvement