refactor in drawings