some formate fixes