Added description and cleaned up main