Improve look and set state