Updated some commets in the code, working on compressing the code structure for readability