Fix entropy definition
Fix indentation
Improved (?) display