remove unnecessary class and change separator to ,