Fixed formatting and linking