Some reformatiing