Code review

Thanks for volunteering!