code restyling and cleaning
add number format