Some code standard fixes
Fixed more code standards