Removed commented lines. Refactoring. Added explicit comments to the
draw tool.