Worked on Number.java; consolidating code