clean up
fix type