Clean up images.py a little, follow style from other controllers