Improve EndState
Fix indentation; Fix EndState inheritance