New clean code updated on stable