New hash key styles and general cleanup