refactor this a bit, split this list into two lines, indent