Make formatting work properly