Cleanup (linter warnings)
Fixing != >> !==
Cleanup (linter warnings & formatting)