remove state default. code consistency changes.
json notation fix