Fix comment type
Seperate completion settings