Added comma seperated list; cleaned up
Updated per Yoshiki and Adams comments