Improved code portability.
slight code cleanup.