Style updates and reorganization.