* fixed some format issues