3rd revision. Minor changes/cleanup