Comment update. slight code re-arrange