Made a second commit that addressed your comments. Thank you!