Style lifting + minor corrections.