Tweak code layout