Format comments and remove useless method