API calls collected in one place
API calls removed
unecessary lines removed
API calls removed