cleanup: outdated comments are fixed, decorator is renamed