cleanup
add menu typing