Remove stray do
Move State to its own source file