Slightly better code layout