cleaning up the codebase and linting