move to state
style nits