minor changes, beautify