Fixed fixmes
Stricly compare booleans, use || instead of 'or', type hint parameters
Remove unused imports
Cleanup commented code
Remove unused vraiables