Middle update to cleaning first week code