Do refactoring and add text into shapes