Improve deadlock interface
Style changes, remove unused lattices