Removed whitespace
Minor doc change
Added ProtocolState and moved protocol stuff into there