Tiny refactor and added todo