Number Function 2 - readablity and logic corrections