Small refactorings / removing todos