Fixed formatting and adapter