Some cleanup and added more work