Distribution.Simple.Setup: Clean up + refactor list

Trivial refactoring