Misc: more code style