more type clean up