Cleaning up commenting
More commenting