Better formatting and further details