Minor code standardization