review indentation
Standardization of names