Code review

Partway through