Some code cleanup
Some code cleanup

ofer43211/unisubs,pculture/unisubs,pculture/unisubs,ReachingOut/unisubs,ofer43211/unisubs,ReachingOut/unisubs,eloquence/unisubs,eloquence/unisubs,ReachingOut/unisubs,ofer43211/unisubs,pculture/unisubs,pculture/unisubs,wevoice/wesub,eloquence/unisubs,wevoice/wesub,norayr/unisubs,wevoice/wesub,ofer43211/unisubs,ReachingOut/unisubs,norayr/unisubs,wevoice/wesub,eloquence/unisubs,norayr/unisubs,norayr/unisubs