Refactor to remove some tangles.
Use convenience methods.