palantir/blueprint + (26) -

    Sorry for the so-many commits but the lint won't let this commit pass the test unless I remove all the newlines, if this modification won't help I ask from a maintainer to look into this.
    * Undo some of Chris's stuff (sorry Chris!), address comments