Comments and cleanup