Refactor

Created by  Eelco Dolstra  on July 7, 2015
HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC
Dependencies
In channels
upstream
main
Change contents