Refactor: minor cleanup