cleaned up clayadavis