cleaned up formattting