minor refactors & optimizations HDrawable