refactor
refactor, beautify