Continue the cleaning
Merge remote-tracking branch 'origin/refactor' into secretkey

* origin/refactor:
  Begin refactoring of images.py