Cleaning up unnecessary imports
Cleaning up and adding comments
Fixed some of the parsing steps