Fix some code beauty issues