Cleaned up to fix-up pear standard coding style