Commenting and cleanup (Michael)