I don't think it really hurts to expose them, we could separate it but all it would do is add an extra function call and make the code a bit bigger --- probably not worth it.