Cleaned up, added coherence.