Cleanup and feedback from @ColinDKelley