* More 21w39a stuff * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Rename some methods Co-authored-by: liach <7806504+liach@users.noreply.github.com>