Fix code format errors
16 files changed