Fixed formatting and type-o