some tiny refactoring + working on tracker