Simplify

this really simplifies things. fixes #1