* some re-factoring and comments clean up