Cleanups found during review