cleaned up the format