Merge "Minor code cleanup"