Can format HashDict and some consistency refactorings