Updated and cleaned up format of simple datatype definitions