More refactorings previous to parsing drawables