cleaned up datatype a little