Spending some time cleaning up Havarl