Modified comments and header file guards