Cleaned up datatypes