Code review

Items discovered with @zachallaun during code review. Let us know if you have any questions.