a few more code review things