Fixed style; still preparing for v1.07