Incorporate feedback from @calebthompson