Slightly better code