Address Jan's review comments