Remove some unnecessary function_exists() checks and some minor improvements
5 files changed