minor formatting and privates improvement