General formatting fixes