Houskeeping for states

Respecting 80 char limit. Fixed some documentation warnings.