[Code] Code style tidy up