Minor changes: mostly style