Cleaned up Drawing Tools