Refactoring, other things
Drawing