Move decorator out of class to "fix" issues on 3.8/3.9.

Move decorator out of class to "fix" issues on 3.8/3.9. #39