Cleaned up channel joining (initial)