a few cosmetic cleanups ahead of update 0.2