more refactoring: Drawable