--cleaned up preprocessor directives, file headers, and added notation