Small cleanups - no functional changes