Fix alignment of values, add trailing comma