An improved electron and hole mobility model for general purpose device simulation