Improved State formatting
Improved State formatting