Refactor: add const