a bit of cleanup and moved the reflection to the method as it's neater
    and overhead of the reflection each time is not a big deal.