Code review

yay!