More todo
Combine refactored methods