Misc: some code style