Apply suggestions from code reviewCo-authored-by: Austin Keener <keeneraustin@yahoo.com> (commit: baa9544)