Pops update, Refactoring, clean code, SearchVC improvements