Fix some code standard things