Fixing up how values are formatted and returned.