Tweak code style