cleanup: name consistency, indentation