Code review

huzzah!