This one is the charm
Clean up
Small fix