Minor id refactor