Removed deprecated classes
Moved some methods to trait
Added comments
Updated readme