Clean up of some of the Roots code

This cleans up some of the code in the Roots package and issue #5. 

As pointed out in issue #11, METADATA should be updated accordingly as well.