more code standardizing