clean code and preparing for stable version