🎨 Fix linter errors and refactor abit

1 job for master in 1 minute and 47 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
failed #688
test

00:01:47

 
Name Stage Failure
failed
test Test

Test Suites: 1 failed, 1 total
Tests: 0 total
Snapshots: 0 total
Time: 39.6s
Ran all test suites.
error Command failed with exit code 1.
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
ERROR: Job failed: exit code 1