Login via xpath

and some more cleanup
Merge pull request #3 from vdogmr25/Cleanup-and-xpath

Login via xpath