Added a refresh for club list in memory and general cleanup