Draw refactor into class