Clean up formatting
Change data type