Fixing selenium class
Cleanup