Removed a bunch of commented out code, reformatted, fixed for loop in main.cpp