392.35 minor tweaks and code cleanup