better code for previous commit
better code for previous commit

trd-delarajon/Spika-IOS,trd-delarajon/Spika-IOS,trd-delarajon/Spika-IOS,trd-delarajon/Spika-IOS,cloverstudio/Spika-iOS,cloverstudio/Spika-iOS,cloverstudio/Spika-iOS