linted and fixed