JARVIS-338 refactoring and linting
JARVIS-338 refactoring and linting