Small update and reorganization