Improved code quality (IE7 compatibility)