Cleaned up significantly.