Minor code standardizing