small cleanup on some stuff