resolve lint errors + some refactoring :hushed:
Merge remote-tracking branch 'origin/master'