cleaned up formating