General Changes:
● Cleaned up the code

Removed:
● Removed a class, that wasn't needed.
● Removed static from methods that didn't require it.