Simplify and sharpen

// @wheresrhys