Refactor: Input arguments are const