Fixed indentation issues
Renamed and added asserts
p4#: 20846