Minor reordering and cleanup of scm section