Cleaning up files and adding more comments