less whitespace, trying to get the dicts right