checklist and some refacts