Remove the empty comment and set default token