Cleaned up Money class