moveState testing

also some indenting