Cleaned up data types