code cleaning: no line more than 80 characters and remove only condition in requireToken