Did some slight cleanup.