More updates/comments to decorators.py to make it easy to read