Cleaned up preprocessor and comments