Refactor/cleanup of onDraw