code improvements

code improvements

fixed merged file issue

code improvements

code improvements

code improvements and linting