cosmetic change of code structure