Implement recommendations by @samanpwbb @mourner @heyitsgarrett @connor