little code structure change