Minor code modifications for consistency.