Final project cleanup

Preprocessor stuff