Cleanup & commenting
Commenting & cleanup