better code..