Refactored code

A couple API differences