Code refactoring

[Olegt0rr]

Hi! I've found many errors with pyCharm code scanner.
I suggest you to do the same and then fix them all.

[kamuridesu]

Thanks. I will do a refactor as soon as I map all the routes. I took a break from this project because of personal issues, but when I have time will implement what's left, refactor, and fix other things that currently are bothering me