formatting, attempted fixes