Cleaning up and adding more comments