- list and card points not disappearing anymore
- code cleanup