Cleaned and building state updates

Removed disable/enable interrupts around state update