Reviewed formating, removed assert() #4635

Reviewed formating, removed assert() #4635 #5581