cleaning
refactoring drawing
refactoring drawing