A basic attempt for style improvement.