Fix root elements to be variable
Fix parameter name
Remove unnecessary class, use inner class instead resp. method chains
Remove unecessary class by enhancing an existing one a bit
Use camel case and use downcase for non-constants
Fix to pass tests
Merge pull request #194 from dr0i/cleanup

Some cleanup