cleaning up code , linting