Linted and fixed errors