More refactoring of 'Inkognito'