Cleaned up some number extensions