Revert change in class syntax
Accidently reverted too much
Revert "Update to use the _ in front of class variables"

This reverts commit e97774569f9108ddfc020cfc5eab6e9b13e7583a.