Improve skeleton to compilable state