Simplify datatypes