Starting Week4 Standardization

Cleaning up preprocessor directives and implementing simple methods.