Refactor Design State