Took out dummy variable, beautified the files, cleanaed up comments