Get rid of unnecessary getState
Get rid of visible from state, ++ and --