fixed comment formating and string formating as per @superbobry's suggestions