Refactor/analysis todos