Clean up Shays Code + State Machine