Fixed formatting issues - again