basic numbers cleanup