Changed some comments and ifndef