Formatting of e.g. OrderedDict is off

When formatting the following:
```python
OrderedDict([('foo', 1), ('bar', 'baz')])
```
I get this:
```python
OrderedDict ([
('foo',
    1 ),
    ('bar',
    'baz')
])
```
while I would rather get this:
```python
OrderedDict([
    ('foo', 1),
    ('bar', 'baz')
])
```
Except general formatting, also note no space after `OrderedDict` or `1`.