Change some naming and indentations to be more consistent