Light background & some cleanup