cleanup
build status
extracted datatype determination to util class