Simplified some code and broke lines in thumb.php

Change-Id: I99fc63ab473a3f2fe33e0227e5e283e0c195f01b
Merge "Simplified some code and broke lines in thumb.php"