ignore todo lists
Added branch check, clean up and better comments