code cleanup
back to 2 steps/frame