Simplify a lot of stuff (#23)