Code cleaning and prepare #5