Marginally tidier
Ensured outlining is working again
Removed old outlining