More refactoring of Inkognito