Minor (cleanup)