some coding changes, no functionality added