Minor code cleanup

Minor auto code cleanup