Refactor StateSettings (refs #79)