Housekeeping, no functional changes