Renamed block manager to state manager
Removed comments