Clean images controller a little