Draw optional cluster and refactoring