removed explicit runOnUIThread, some minor cosmetic improvements