More cleanup after reading DHH's blog