Minor refactor after #595

Removed freeze

Updated history for #595