Checklist: code cleanup