Some code enhancement