Code linting
Code cleanup
Remove json package dependency