Changed parens to tuple
Move functionality into detail.
Simplification of code.