Finish ! TODO refactoring