Code style change
v0.5.0 release preparation