Updated with PR feedback
Linted