Changed image loading to one-liners