More code review

yay code review