minor cosmetic changes
merge conflicts