refactoring drawable class
no change