Lint runnig

runnig lint and make some code changes