minor code structure fix