FNOK Show clean up a bit