Refactor state creation methods.