A bit cleaning up here and there.