(core) little bit tidier