code cleanup and checklist additions