Code Cleanup

Minor changes - continuation of ongoing code cleanup.