cleaning up more type