Code style cleanup for 1.0.0
Manual merge