added: use comma separated values as targets
refactored: code cleanup