Fix: Keep configuration keys somewhat sorted
Fix: Comments
Fix: Revert unrelated change
Fix: Revert unrelated method removal

Method is never used, but let's just remove it in a different PR.
Fix: Wrapping
Enhancement: Variable names
Merge pull request #4 from localheinz/fix/factories-enhancements

Proposal: A bunch of fixes/enhancements for your PR