Removed default option checks and added global handling flag.

Condition checks were unnecessary and global handling flag should be an option.