apply suggestions of Anil Madhavapeddy