Linted over go code, added comments/changes as expressed.