Code cleanup + fixed that annoying small amount of delay between requesting opening an entry and the password dialog showing