Code police, no functional changes (yet)