code cleanup and test to some showAsThumb changes