Updates following code standardization discussions