PEP 8
GaretJax's comments
Merge the two classes together
Reduce the timeout