Minor refactoring
New todos