Some more formatting and annotation