Addressed feedback by @trevnorris, thanks!