clean up
conversion for the other primitive data types too