Finish background fetch
Clean code