Added new methods to return numbers. Cleaned up code.