linting and updating TODOs
removed comment