Cleaned-up omniture calls and refactored