tiny code structure change