linted and cleaned the code