Clean up / refactoring of ChecklistFragment