Cleaned up NumberField