Code style revision still in progress