Few formatting fixes