Issue #159 - remove hardcoding and add commas to arrays