Ok, great. I'll make the changes and send a PR. Is there anything else I might be able to look into ?