Finishing up changes per code review