Cleaned up state, seems to be working well.

Cleaned up state, seems to be working well. #19