Clean + a couple of nice personal touches