Fix lint errors

cleaning up code