code cleaning
add number functionality